bitkeeper revision 1.329 (3f0d30d74QKz0HxzOWPKez8__UdvjQ)

Merge labyrinth.cl.cam.ac.uk:/auto/groups/xeno/users/rac61/xeno.bk
into labyrinth.cl.cam.ac.uk:/auto/groups/xeno/users/sos22/xeno.bk

diff --cc BitKeeper/etc/ignore
index f41769eb43e868d8dc5746075e31d8824095c0a1,16bde8a32e637b25ed1000f556eb1fed056b0bbb..71eac81846300411f9afd4b0d28cb96807fbd6a9
--- 1/BitKeeper/etc/ignore
--- 2/BitKeeper/etc/ignore
+++ b/BitKeeper/etc/ignore
@@@ -358,8 -358,8 +358,15 @@@ xen/drivers/ide/ide-xeno.
  xen/drivers/ide/ide.o
  xen/drivers/ide/piix.o
  xen/drivers/net/3c59x.o
++xen/drivers/net/8139too.o
  xen/drivers/net/Space.o
  xen/drivers/net/driver.o
++xen/drivers/net/e100/e100.o
++xen/drivers/net/e100/e100_config.o
++xen/drivers/net/e100/e100_eeprom.o
++xen/drivers/net/e100/e100_main.o
++xen/drivers/net/e100/e100_phy.o
++xen/drivers/net/e100/e100_test.o
  xen/drivers/net/e1000/e1000.o
  xen/drivers/net/e1000/e1000_ethtool.o
  xen/drivers/net/e1000/e1000_hw.o
@@@ -369,8 -369,8 +376,19 @@@ xen/drivers/net/ne/8390.
  xen/drivers/net/ne/ne.o
  xen/drivers/net/ne/ne_drv.o
  xen/drivers/net/net_init.o
++xen/drivers/net/pcnet32.o
  xen/drivers/net/setup.o
  xen/drivers/net/tg3.o
++xen/drivers/net/tulip/21142.o
++xen/drivers/net/tulip/eeprom.o
++xen/drivers/net/tulip/interrupt.o
++xen/drivers/net/tulip/media.o
++xen/drivers/net/tulip/pnic.o
++xen/drivers/net/tulip/pnic2.o
++xen/drivers/net/tulip/timer.o
++xen/drivers/net/tulip/tulip.o
++xen/drivers/net/tulip/tulip_core.o
++xen/drivers/net/via-rhine.o
  xen/drivers/pci/classlist.h
  xen/drivers/pci/compat.o
  xen/drivers/pci/devlist.h
@@@ -439,21 -439,21 +457,3 @@@ xenolinux-2.4.21-sparse/arch/xeno/drive
  xenolinux-2.4.21-sparse/arch/xeno/drivers/block/xl_physdisk_proc.c.bak
  xenolinux-2.4.21-sparse/arch/xeno/drivers/block/xl_physdisk_proc.c~
  xenolinux-2.4.21-sparse/include/linux/blk.h~
--xen/drivers/net/8139too.o
- xen/drivers/net/pcnet32.o
- xen/drivers/net/via-rhine.o
--xen/drivers/net/e100/e100.o
--xen/drivers/net/e100/e100_config.o
--xen/drivers/net/e100/e100_eeprom.o
--xen/drivers/net/e100/e100_main.o
--xen/drivers/net/e100/e100_phy.o
--xen/drivers/net/e100/e100_test.o
 -xen/drivers/net/pcnet32.o
--xen/drivers/net/tulip/21142.o
--xen/drivers/net/tulip/eeprom.o
--xen/drivers/net/tulip/interrupt.o
--xen/drivers/net/tulip/media.o
--xen/drivers/net/tulip/pnic.o
--xen/drivers/net/tulip/pnic2.o
--xen/drivers/net/tulip/timer.o
--xen/drivers/net/tulip/tulip.o
--xen/drivers/net/tulip/tulip_core.o
 -xen/drivers/net/via-rhine.o